From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 4 Sep 2008 03:13:55 +0000 (+0000)
Subject: * (bug 2889) MediaWiki:Print.css applies to the printable version
X-Git-Tag: 1.31.0-rc.0~45498
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=b81107905fe205d2f9f9b40b8f46cdb72ee13f29;p=lhc%2Fweb%2Fwiklou.git

* (bug 2889) MediaWiki:Print.css applies to the printable version

MediaWiki:Handheld.css and MediaWiki:Print.css now available (handheld only if $wgHandheldStyle is configured).
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69a8f6d1ab..a4bef36edb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -112,6 +112,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   displaying an external image inline.
 * (bugs 15405, 15436) Sort more currency types correctly in sortable tables
 * (bug 15422) Sort more different types of numbers in sortable tables
+* (bug 2889) MediaWiki:Print.css applies to the printable version
 
 === Bug fixes in 1.14 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 9296d24318..5dd109fe61 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -566,6 +566,7 @@ END;
 		// If we use the site's dynamic CSS, throw that in, too
 		// Per-site custom styles
 		if( $wgUseSiteCss ) {
+			global $wgHandheldStyle;
 			$query = wfArrayToCGI( array(
 				'usemsgcache' => 'yes',
 				'ctype' => 'text/css',
@@ -573,6 +574,10 @@ END;
 			) + $siteargs );
 			# Site settings must override extension css! (bug 15025)
 			$out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) );
+			$out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI), "print" );
+			if( $wgHandheldStyle ) {
+				$out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI), "handheld" );
+			}
 			$out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
 		}